From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Date: Fri, 17 Mar 2017 08:42:31 +0000 (+0800)
Subject: libxl/libxl_qmp.c: Update COLO do checkpoint API
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2463
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22man:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22man:/?a=commitdiff_plain;h=81273745453456a105cb64bf6824a728048fb55f;p=xen.git

libxl/libxl_qmp.c: Update COLO do checkpoint API

The QEMU community has asked us to change the QMP command from
xen-do-checkpoint to xen-colo-do-checkpoint. Modify Xen side to use
the new name.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/tools/libxl/libxl_colo_restore.c b/tools/libxl/libxl_colo_restore.c
index 065ea001e3..7178ae9b84 100644
--- a/tools/libxl/libxl_colo_restore.c
+++ b/tools/libxl/libxl_colo_restore.c
@@ -607,7 +607,7 @@ static void colo_restore_preresume_cb(libxl__egc *egc,
     }
 
     if (crs->qdisk_setuped) {
-        if (libxl__qmp_do_checkpoint(gc, crs->domid)) {
+        if (libxl__qmp_colo_do_checkpoint(gc, crs->domid)) {
             LOGD(ERROR, crs->domid, "doing checkpoint fails");
             goto out;
         }
diff --git a/tools/libxl/libxl_colo_save.c b/tools/libxl/libxl_colo_save.c
index b4ca9f60dd..eabc04c88b 100644
--- a/tools/libxl/libxl_colo_save.c
+++ b/tools/libxl/libxl_colo_save.c
@@ -460,7 +460,7 @@ static void colo_preresume_cb(libxl__egc *egc,
     }
 
     if (!css->paused) {
-        if (libxl__qmp_do_checkpoint(gc, dss->domid)) {
+        if (libxl__qmp_colo_do_checkpoint(gc, dss->domid)) {
             LOGD(ERROR, dss->domid, "doing checkpoint fails");
             goto out;
         }
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 7722665194..9fc05e7093 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1831,7 +1831,7 @@ _hidden int libxl__qmp_start_replication(libxl__gc *gc, int domid,
 /* Get replication error that occurs when the vm is running */
 _hidden int libxl__qmp_get_replication_error(libxl__gc *gc, int domid);
 /* Do checkpoint */
-_hidden int libxl__qmp_do_checkpoint(libxl__gc *gc, int domid);
+_hidden int libxl__qmp_colo_do_checkpoint(libxl__gc *gc, int domid);
 /* Stop replication */
 _hidden int libxl__qmp_stop_replication(libxl__gc *gc, int domid,
                                         bool primary);
diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c
index a91643a4f9..eef772220f 100644
--- a/tools/libxl/libxl_qmp.c
+++ b/tools/libxl/libxl_qmp.c
@@ -1085,9 +1085,10 @@ int libxl__qmp_get_replication_error(libxl__gc *gc, int domid)
                            NULL, NULL);
 }
 
-int libxl__qmp_do_checkpoint(libxl__gc *gc, int domid)
+int libxl__qmp_colo_do_checkpoint(libxl__gc *gc, int domid)
 {
-    return qmp_run_command(gc, domid, "xen-do-checkpoint", NULL, NULL, NULL);
+    return qmp_run_command(gc, domid, "xen-colo-do-checkpoint",
+                           NULL, NULL, NULL);
 }
 
 int libxl__qmp_stop_replication(libxl__gc *gc, int domid, bool primary)